Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 23 Mar 2010 21:50:49 +0000 (21:50 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Tue, 23 Mar 2010 21:50:49 +0000 (21:50 +0000)

Trivial merge